Bug fix with days ordering