Fix an issue with Spring AOP