Resolved rows/week issue