Fix issue 39 part 5. To be cotinued