Convert #180807 to Flügger