moving to 1.6.9.4 (untested)