Fixes #554