Fixed bug: Use correct index for searching
For #master