Convert #623797 to Flügger