fix #554