closes #3363