Added fix for 32 bit