Avoiding collisions by not using $.
Merge branch 'fix'