Fix BuggyBuggy