Convert #337582 to Flügger