Convert #344848 to Flügger