Bug/grouping week fix