more view mode checking, compare bc9523473dc607b7567d85586a9f91ba1d705d98