Fix #323: Upgrade 2.1.17 to 2.1.18