Convert #344569 to Flügger