Good change. Thank you. Can you provide some addition test cases to show that this change solves the problem?