Didn't we just take a similar fix from @mcquin?