Convert #623687 to Flügger