- Fixed a potential crash/infinite-loop bug if -H was used