Fixing follow/unfollow issue