Fixes made for challenge 2288