fix bug 1034185 and bug 1034185