Fixed logic from last Request update.