closes #740, closes #741