bug #3885 Additional fix for this bug

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_1'