Entities Group Fix