Convert #623526 to Flügger