Change to int64_t