partial update to 2.1.8