Complete the fix for bug #4418

Signed-off-by: Marc Delisle <marc@infomarc.info>