Convert #521549 to Flügger