Fix request awareness