Actually the previous commit solved a BIG issue with the OP count