Fixed underscore method with some monkey patching.