Boss made me do it annotation :)
Fix JSON serialization