Fixing bad forms logic...