closes #815, closes #816