Convert #618249 to Flügger