Added extra name check