Convert #720338 to Flügger