Resolves #1858.