Bugs Fixed

Signed-off-by: Victor J. Valencia Gomez <viktor1190@hotmail.com>