Code fix done