Fix variable interpolation