get rid of comparison with None