issue fix and aop enhance