How 'bout this fix, eh?
closes #3388