last change was only required in lazy loading and breaks eager loading, reverted