Convert #517490 to Flügger