Fixed this and found a couple of other places in the code as well!