Fixed Sunday issue