Fix wrong condition
Merge branch 'beta'