Fix for with each in admin