Resolves #1518