Convert #344337 to Flügger