Check for sub format before splitting [Bug Fix]