Fix edge cases
Fix edge cases

apple/swift,roambotics/swift,apple/swift,roambotics/swift,roambotics/swift,roambotics/swift,apple/swift,roambotics/swift,apple/swift,apple/swift,apple/swift,roambotics/swift