Fixed previews handling