fix generator and json