Fix contact-first