Corrected some stuff in traversal macro