Fix Integer handling