closes #3332