Fixes #554.