Convert #517488 to Flügger