fixed bug with underscores and dashes