Fix #59 - proper handling of interpolated vars