closes #2287