this looks similar to the other recent fix. have we missed some code duplication?