closes #3363, #2732