fixed index map bug