Bug/by week fix