Fixed #554