Convert #397281 to Flügger