Another strict_variables fix