Convert #366745 to Flügger