Fixed calculate methods: average and random.