Refactoring.
Fixed compilation problem.