Convert #623676 to Flügger