Convert #720339 to Flügger