ugly 64-bit targets fix (cont.)