fixing CommonManager