Convert #521336 to Flügger