Another change for Issue #287