fix on Entity and Controllers