Fixed splitting/merging bug introduced in last update