fix
fixed underscore issues