Convert #623335 to Flügger