Convert #541870 to Flügger