Manager bugfix