Convert #377228 to Flügger