Fixed Check That
Fixed issues

Change-Id: Ie8fd8df3e5a99a2d2f417204efd69073ed976de2
Signed-off-by: Marcelo <Marcelo@DES214>