closes #2084