VID-1835 Make sure to use those variables