Resolves #837