added a bit of sanity to the manager