fix on contact form and #18