bug fix on infinite recursion due to bad method wrapping.