some fix done