Convert #541337 to Flügger