Convert #548759 to Flügger