bug_fix_#4