36bit bug fix