Fix issue with traverse