Fix issue 39 part two. To be cotinued