Convert #517813 to Flügger