Yeah, I'd agree, add a flag to use the old way, or get Sat to help you on this