added splitting and unsplitting fixes