Fix for Issue #147.