Convert #623554 to Flügger