Bug fixed in WH generation