Fixes issue with indexOf