Little bug fix with context follower