Made on additional fix as per previous pull request.