Pulling Steven's bug fix from master to 6.MITx