Convert #521639 to Flügger