Make safe guard even more strict
Merge branch 'v1.0'