Convert #541377 to Flügger