Fix possible entities's action problem