Convert #613441 to Flügger