Fixes #370. Corrects issue with the setup process.
Merge pull request #371 from pencilblue/issue/PB370

Fixes #370. Corrects issue with the setup process.