Fix added for 32bit system integer problems