fixed underscore char handling in identifiers