fix 2**64 issue and fast start