Reviewed-by: jccollet

Summary: update implementation to use long instead of int
Reviewed-by: michaelm