fixes to 2.1.6