Bug 2246 fixed

Change-Id: Ic35d131d4e44686de207b0a6acc3360e04306cb2
Signed-off-by: Pedro Escaleira <escaleira@av.it.pt>