Bug fix B31G
bug fix