Change to orientation bug fix