rest of Depth-5 fix