fixed struct to match json marshall