fix variables inclusion for good