Convert #613809 to Flügger