Fixed issue with underscores