Resolves #813