Convert #344579 to Flügger