add raw index back
by wilee