* Fix for issue #162
* Unittest so that this doesn't happen again