Fixed one last bug