Fix edge case hard to reproduce