closes #3086