fixed some bugs in EPTableOptimized