Convert #160216 to Flügger