closes #690, closes #691