Fixed mishandling of underscore character