Fix Orientation Crashes
Commit fixes issue #1