Tag : improve safety