Fix when strict_variables is enabled