Fix issue 39 part 4. To be cotinued