Fix shape.units. Closes #9