Fixed for 64 bit architecture