Convert #581127 to Flügger