8785 fix