Merge branch 'fix_bug_ref'