modified behavior of -h

Change-Id: Ib6f12345c145402ad7e5da9acaedb7d5a5f10785