Fix for strict_variables