Fix for #554