Update to 2.1.8

Update to 2.1.8 after previous bug fixes