I think the updated condition I mentioned in the bug would solve the corner case, wouldn't it?