Fixing numeric value serialization

Change-Id: Iaeebbe9c07ce9bc6d1427a2b8866efb7971caf19