fix for new forms