Propagate changes correctly (thanks @kentarmiura)