Fix the issue with ELB due to entities lazy loading