fixed logical exit issue
Merge branch 'zac'