More sane solution for common name check