Patch with a new variable and some fixes. (4.9.3a)