Fix with null occurences