Fixing problems with one-off preview facility