Convert #521393 to Flügger