Fixing container instantiation