Minor improvement for rendering