Convert #349635 to Flügger