Convert #623406 to Flügger