Convert #337603 to Flügger