Fixed potential issues with other libraries with regard to AOP manager