Convert #618187 to Flügger