Added indexOf shim