Fixing conditional order
Merge pull request #141 from zijistark/beta-pr

Fixing conditional order