Fixed the shearing issue