Fixing form plugin issue