Fix form conflict