Fixed the last bug fix