Fix Json serialization error (cherry picked from commit 91600b1c81) Signed-off-by: Joshua Boniface <joshua@boniface.me>
91600b1c81