Bug#4060 fix