Bug fix for when not gen gson