Update with patch of Bernd Eckenfels