Fix to path splitting