Fix for nested walk