Convert #623229 to Flügger