Type fix to work with int/long number data in payload