fixes #799
Merge pull request #804 from leoj3n/topic.walker

fixes #799