Convert #518039 to Flügger