Fix broken logic and a quick test hack
Merge pull request #142 from rossbruniges/stage

Fix broken logic and a quick test hack