fix for #61 was incomplete and forcing all shapes to rectangles