Fixed hatch clipping.

Replaces #2001