Fix to use local scale and rotation