Do the #2 fix for form preview as well