Better protection (9/31)

Better protection