Implicit cast was truncating long to int; just use long.
Also change from float to double to reduce chance of overflow.

Change-Id: I8f15e29f52e14ab746996f319e35ff1cadda2102