fixing issues

fixing issues