fixade nullpointers