Convert #541637 to Flügger