Sush | #2105 | Fixing the count