Manipulation BugFix