Fix issue where non-file forms break