bug_fix_333909
