Convert #618246 to Flügger