(bug #2904) this patch is a fix from previous