Correction NPE