Worked out one last bug