Made Subsplits compatible with 1.5