Fixed bug in maintaining organism index