Fix issue 39 part 3. To be cotinued