Resolves #460