- Fixed more silly error (I really, really, really need to sort out the tests)