Rotation change bug fixed