closes #2064