closes #883 and closes #834