Fixed the fix

use IOC container!