revert FIX NPE