Workaround for orientation bug