Draft: Fixed bugs in hatching - fixes #1164