orientation fix
Merge branch 'orientation'