Convert #397921 to Flügger