Convert #366889 to Flügger