fix underscore refs