Bugs Fixed ER116-i,j,k

Bugs Fixed ER116-i,j,k