Convert #521482 to Flügger