Fix for int64