fixed some hatch bugs
Merge pull request #422 from smallfix/hatchfix1

fixed some hatch bugs