prepare for Int => Integer (issue 33)