Convert #623485 to Flügger