Fix for form guide