Resolves #457