Convert #397058 to Flügger