Fixing problem.

partially fixed.