Adding fix for - vs _