2nd Attempt to fix depth issue