Convert #586779 to Flügger