commit to bug_fix_789
manual merge again