Need to finish the unit tests to find issues like this...