Convert #160606 to Flügger