Adjusting table resolve #35