[FIX] BugFixes