fix ponzo + split handling