fixed underscore refs