v1.9 fix5