Investigate, fix handling of corners
Possibly related:
#12
cc
@mattwala