Propagate changes correctly (thanks @kentaromiura)