Fix/each dollar

This resolves #1027.

I don't think it should cause any problems.  I will merge it if there are no complaints by 2013-05-21T18:00:00Z