Jose Commit: Fixed sucks logic