Caught the last edge cases.