Second try to fix manager bug

Change-Id: I29aad79681978bc90267f18e4ba98e82d6a7add2