bug fix : if condition != None