sloved some problems during cross-team debug