Convert #517638 to Flügger