Fix strict_variables issue during first run