Fixed challenge 2 solution