closes #1825, closes #1674