Fixing bug with $ character
Merging fixs