based entity fixed