Fix strict_variables issue