Resolves #816