v1.9 fix1