Convert #517538 to Flügger