fixing issues in the branch