Small improvement for variables field