FIx NPE