Convert #356079 to Flügger