Solving bug...