fixing is not none