Quick fix on base mgr