Resolves #1093