Fix #95 et full security check(auth)