Geometry transformations bug fixing