closes #956