fixed bug with underscore