Fixing manager bug