fix commonEntity