small improvement for 8000 patch