Convert #377381 to Flügger