MIST-157: variable declaration needs to change also