Correcting work loss from @GuillaumeGomez last PR.