closes #2286