Fixing #554