fix valley issues
Merge pull request #1506 from edisonout/valleyfix

Fix valley issues