Adapt to 11.16.4's changes.
Merge pull request #1 from baldowl/master

Adapt to 11.16.4's changes.