Fixing one last bug