[#111] Use helper funcitn for int values