closes #976
closes #976