Fixed current week bug