Take out the condition for nmv checks