Fixed bug with the manager