Fix table lookup