Convert #517426 to Flügger