Fixes #2852
Merge pull request #3220 from Rockdtben/fixFollowBug

Fixes #2852