rere-fix variables