Fixing overflow issues with splitter