v1.89 fix17