Fixing Bug 418043

Signed-off-by: André Pinto <andre.pinto@blip.pt>