rotation fix
Merged