bug_fixes again!!!