Bug Fix of  af6586140566b32053c757135b5fdabadee7200f