Liitle fix after some refactor.