Convert #368357 to Flügger