Make safe guard even more strict