Convert #369079 to Flügger