Another fix for Issue #147