Fix the 'following' functionality