vars support fix