Fixing extendMatch