Bug fix. Refactoring.