fixed probems required for pull request