fix for fix for fix for #554