8995 fix