Fixed: Use now the obvious indexOf