closes #2492