Improve synchronisation when using scenarios