closes #2528