Temporary fix for splitter: #1968
Merge pull request #2038 from dinhviethoa/1968-splitter

Temporary fix for splitter