Fix for depth off by 1 for collection entities