closes #2064
closes #2032