fix issue for non admins