Bugfix for $update_when_modified