closes #742, closes #741