Convert #332848 to Flügger