bug fix done