Fix edge-case bugs found in a thorough code review 74fe989 verified Archie0099 commited on 23 days ago