Better underscore checking