Fixed Safe control rendering with AVI