Convert #180602 to Flügger