Added support for 32 bit targets