Fix variable expression