fixing of latest changes