correction NPE