Fixes issue #554