Convert #366715 to Flügger