closes #3590