Removed unneccessary name check