Reopening as the issue is a bit different and we need to incorporate both test cases and be sure both cases are fixed.