global: refactoring

* Fixing the problem unhandled during the "pending" states addition.

Signed-off-by: Yoan Blanc <yoan.blanc@cern.ch>