Convert #541425 to Flügger