Convert #720438 to Flügger