fix declare and enroll