Convert #180221 to Flügger