My Fixes

Pleas don't use a static method in a Manager if possible :)