Fix underscore issue