Further fix (the previous one didn't quite do it).