Convert #367138 to Flügger