Convert #623305 to Flügger