Fixed some scatter
Merge pull request #874 from jaypoulz/newBranch

Fixed some scatter