`count` and `include` fix v.2