Fixing use of Manager