Fix rare bug