fix issues with manager