Resolves #523