Fix suggested by Wolfgang Adam