I completely forgot to take a look at this, sorry I will push 1.8.9-beta1 soon, which may have an improvement for this.
