Convert #658794 to Flügger