Convert #517831 to Flügger