Ep16 Fixing issue with policies