Zoom now works correctly for all modes.