Better protection (11/31)

Better protection