Should fix Issue #149.  Related to Issue #147.