#6: Fix javascript swizzling bug