fixes #6 var support