if null nothing and little fix