FIX: add split will throw NPE