Fix two very bad edge case