CGIV-1650: Have to use variables