Revised fix for code=995 sped bug.