GIL - Please look at this..
i wrote //1.6.14 near the change i made look if its ok