Convert #541538 to Flügger