Avoid rollover with long