closes #2529