Fix tableless-model issue