new change for hybrid package, by wangyi