Final week bug fix