quick and dirty fix for AutoEnroll issue