Bug fix - manager