Convert #623228 to Flügger