fix wrong condition
Merge branch 'master' into tg