Fix for form bug