fix Integer handling