issue #554 fixed

Please review...