Manually added #6 fix by @paulyoung