Convert #517039 to Flügger