fixing issues from PR