Added further compability for 32bit mode