Convert #521979 to Flügger