library fix, splitter fix