Fixed  bug of non found return statements.