Fix suggested by Mirko