Fixed shape redraw bug. Closes #43