Bug fixing Iteration

Bug fixing Iteration