Fix: replace $ also in expressions