fixing bugs due latest changes
...