Temporary fix for splitter

TBR: @ussuri

#1968