As discussed in #255 (closed). Have only checked that it works, haven't done any benchmarks, but this can only make things faster