Upgrade to version 2.1.8