Bugfix/3.1/sb#416 previews screwed up

Someone deep into the new renderer should have a second look at this, please.