Add special case for underscore character