Temporary fix for rotation