Fix type and table