Use a correct equation number
Move table read to a proper place