closes #951