fixing condition load
loose focus maybe fixed ?
Merge branch 'refs/heads/dev' into feature/assignation