Fixed for building 64-bit