Change for 64 bit too