Better protection (13/31)

Better protection