bug_fixes: bonus