Tim/dollar at assignment 1.8

Ports @matthias-springer's  patch to 1.8