fixed minor issue
fixed the adept case