Convert #081119 to Flügger