Fixed Bug, Working on new bug