fix bugs in any entity