Enzi, fixes #518