Issue #606 supporting with test unit