Convert #623441 to Flügger