Convert #517745 to Flügger