Added check for octet mode