resolves #597