closes #957