Convert #618098 to Flügger