some fix for the index not align problem