fixed bug issue of #1213