Fixes AOP: uses current class model rather than  class model that originally defined the method