Fix for manager