fix entity getters and setters