I'm 99% sure this area was reworked for similar issues, but the specific tickets escape me. Feel free to attach a test case if it's still an issue