closes #2399