Preview mode fix