Convert #623558 to Flügger