Convert #377670 to Flügger