Fix issue reported by Moritz.