Fix bug with end of the week in structed task