Convert #364035 to Flügger