Use more safe code