Convert #517179 to Flügger