Fix #554