solves issue #554