Fixed issue caused by last commit that made nosetests fail