8780 fix