Fixed issue where some int values where strings