Better fix for contact form