Convert #623361 to Flügger