Fixing major bug problem.