Added check for target of wrong number of fields