Convert #160409 to Flügger