Added fix for form updates