Better underscore fix...