Convert #397249 to Flügger