Fixing broken split feature