Policies fix