Commit ba13b70fcf5e38747ec4d14c5694e2118e9fd0da reintroduced #34 - breaks CurvedSegments
Commit ba13b70 reintroduced #34 - breaks CurvedSegments