Added experiment_size bug fix from master