improve static safety