Posible error in index builder function
Merged develop branch