Convert #710339 to Flügger