Fix issue 39 part one. To be cotinued