Convert #710939 to Flügger