closes #2035, closes #2036