Added fix for rotation