Fix entity accessor