potential fix for issue #554