Convert #521734 to Flügger