Small changes. Bug fix