closes #2566