Added conditional support for 64 bit