Convert #623489 to Flügger