One last bug fix before I go to sleep