Fixed First Round Bug