Convert #405847 to Flügger