Fix splitting parts