Convert #618243 to Flügger