closes #1710, closes #1700