Convert #541629 to Flügger