closes #3530