closes #2520