Fix regression with long() creeping in from 07ff989747b7a41c1ad1839732595a658e1cb493