Moved checks below the face-add