Variable resolver now works OK