fixed preload/viewer combining (patch from Simon Kauppi)