Unit field is not checked if its empty
unit field now functional