Convert #478338 to Flügger