bug fix: walk on the modifications