Fixing first day of the week problem