Last minute bug fix