resolves #646