Code fixing for current var