applied Jeroen Schot's shiftview patch