Convert #335828 to Flügger