fixed merge issue.
Fixed checkAdmin