Int64 fix 2