Bug fix : Run-time variable lookup