Fix table  (Close #7)