Convert #541238 to Flügger