Convert #623249 to Flügger