Fix for 32bit integers