Fixed newly introduced orientation-change-crash-bug