Fix suggested by Axel Rauschmayer