Fix issue of original method invocation

Fix issue where original method is still invoked when setup to override.