Extend fix for previous commit.