Convert #517547 to Flügger