Fix issue with Method swizzling that was not properly automatically called.
Should fix #38 and #37