Convert #423367 to Flügger