Final fix for orientation